From 0e08ebc7d4c37b454546bccbbc4d2dd08ca784c8 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Wed, 31 Dec 2003 16:02:22 +0000 Subject: [PATCH] Use ngettext for plurals (#123847). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk-pixbuf/gdk-pixdata.c | 4 +++- gtk/gtkfilechooserdefault.c | 2 +- 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8be3eea65..b4e8da78c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-12-31 Christian Neumair + + * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata): + * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for + plurals (#123847). + Wed Dec 31 02:05:39 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c8be3eea65..b4e8da78c3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-12-31 Christian Neumair + + * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata): + * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for + plurals (#123847). + Wed Dec 31 02:05:39 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c8be3eea65..b4e8da78c3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-12-31 Christian Neumair + + * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata): + * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for + plurals (#123847). + Wed Dec 31 02:05:39 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c8be3eea65..b4e8da78c3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-12-31 Christian Neumair + + * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata): + * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for + plurals (#123847). + Wed Dec 31 02:05:39 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c8be3eea65..b4e8da78c3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-12-31 Christian Neumair + + * gdk-pixbuf/gdk-pixdata.c: (gdk_pixbuf_from_pixdata): + * gtk/gtkfilechooserdefault.c: (list_size_data_func): Use ngettext for + plurals (#123847). + Wed Dec 31 02:05:39 2003 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full): diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c index 445e7adf7f..cc17de48f1 100644 --- a/gdk-pixbuf/gdk-pixdata.c +++ b/gdk-pixbuf/gdk-pixdata.c @@ -399,7 +399,9 @@ gdk_pixbuf_from_pixdata (const GdkPixdata *pixdata, { g_set_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, - _("failed to allocate image buffer of %u bytes"), + ngettext("failed to allocate image buffer of %u byte", + "failed to allocate image buffer of %u bytes", + pixdata->rowstride * pixdata->height), pixdata->rowstride * pixdata->height); return NULL; } diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 731c49a58e..ac3e66b647 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2946,7 +2946,7 @@ list_size_data_func (GtkTreeViewColumn *tree_column, return; if (size < (gint64)1024) - str = g_strdup_printf (_("%d bytes"), (gint)size); + str = g_strdup_printf (ngettext ("%d byte", "%d bytes", (gint)size), (gint)size); else if (size < (gint64)1024*1024) str = g_strdup_printf (_("%.1f K"), size / (1024.)); else if (size < (gint64)1024*1024*1024) -- 2.30.2